From aa1bf581963e779d43ed1b4996674be5d8278983 Mon Sep 17 00:00:00 2001 From: Lars Hamann Date: Wed, 22 Jul 1998 21:13:48 +0000 Subject: [PATCH] few fixes for gtk_signal_emits * gtk/gtkctree.c (tree_select/unselect) (tree_expand/collapse) (tree_toggle_expansion) (real_select/unselect_row) (gtk_ctree_select/unselect) : few fixes for gtk_signal_emits --- ChangeLog | 6 ++++++ ChangeLog.pre-2-0 | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-2 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gtk/gtkctree.c | 28 +++++++++++++--------------- 8 files changed, 55 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index 25ff25730f..b7a1b325ae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Wed Jul 22 23:00:44 1998 Lars Hamann + + * gtk/gtkctree.c (tree_select/unselect) (tree_expand/collapse) + (tree_toggle_expansion) (real_select/unselect_row) + (gtk_ctree_select/unselect) : few fixes for gtk_signal_emits + Wed Jul 15 17:44:47 1998 Owen Taylor * gtk/gtktext.c (new_text_property): We free things from diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 25ff25730f..b7a1b325ae 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +Wed Jul 22 23:00:44 1998 Lars Hamann + + * gtk/gtkctree.c (tree_select/unselect) (tree_expand/collapse) + (tree_toggle_expansion) (real_select/unselect_row) + (gtk_ctree_select/unselect) : few fixes for gtk_signal_emits + Wed Jul 15 17:44:47 1998 Owen Taylor * gtk/gtktext.c (new_text_property): We free things from diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 25ff25730f..b7a1b325ae 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Wed Jul 22 23:00:44 1998 Lars Hamann + + * gtk/gtkctree.c (tree_select/unselect) (tree_expand/collapse) + (tree_toggle_expansion) (real_select/unselect_row) + (gtk_ctree_select/unselect) : few fixes for gtk_signal_emits + Wed Jul 15 17:44:47 1998 Owen Taylor * gtk/gtktext.c (new_text_property): We free things from diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 25ff25730f..b7a1b325ae 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Wed Jul 22 23:00:44 1998 Lars Hamann + + * gtk/gtkctree.c (tree_select/unselect) (tree_expand/collapse) + (tree_toggle_expansion) (real_select/unselect_row) + (gtk_ctree_select/unselect) : few fixes for gtk_signal_emits + Wed Jul 15 17:44:47 1998 Owen Taylor * gtk/gtktext.c (new_text_property): We free things from diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 25ff25730f..b7a1b325ae 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Wed Jul 22 23:00:44 1998 Lars Hamann + + * gtk/gtkctree.c (tree_select/unselect) (tree_expand/collapse) + (tree_toggle_expansion) (real_select/unselect_row) + (gtk_ctree_select/unselect) : few fixes for gtk_signal_emits + Wed Jul 15 17:44:47 1998 Owen Taylor * gtk/gtktext.c (new_text_property): We free things from diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 25ff25730f..b7a1b325ae 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Wed Jul 22 23:00:44 1998 Lars Hamann + + * gtk/gtkctree.c (tree_select/unselect) (tree_expand/collapse) + (tree_toggle_expansion) (real_select/unselect_row) + (gtk_ctree_select/unselect) : few fixes for gtk_signal_emits + Wed Jul 15 17:44:47 1998 Owen Taylor * gtk/gtktext.c (new_text_property): We free things from diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 25ff25730f..b7a1b325ae 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Wed Jul 22 23:00:44 1998 Lars Hamann + + * gtk/gtkctree.c (tree_select/unselect) (tree_expand/collapse) + (tree_toggle_expansion) (real_select/unselect_row) + (gtk_ctree_select/unselect) : few fixes for gtk_signal_emits + Wed Jul 15 17:44:47 1998 Owen Taylor * gtk/gtktext.c (new_text_property): We free things from diff --git a/gtk/gtkctree.c b/gtk/gtkctree.c index f9c9dbb41c..da9763d4ec 100644 --- a/gtk/gtkctree.c +++ b/gtk/gtkctree.c @@ -3124,8 +3124,8 @@ tree_select (GtkCTree *ctree, gpointer data) { if (node && GTK_CTREE_ROW (node)->row.state != GTK_STATE_SELECTED) - gtk_signal_emit (GTK_OBJECT (ctree), ctree_signals[TREE_SELECT_ROW], - node, data); + gtk_signal_emit (GTK_OBJECT (ctree), ctree_signals[TREE_SELECT_ROW], + node, -1); } static void @@ -3135,7 +3135,7 @@ tree_unselect (GtkCTree *ctree, { if (node && GTK_CTREE_ROW (node)->row.state == GTK_STATE_SELECTED) gtk_signal_emit (GTK_OBJECT (ctree), ctree_signals[TREE_UNSELECT_ROW], - node, data); + node, -1); } static void @@ -3144,8 +3144,7 @@ tree_expand (GtkCTree *ctree, gpointer data) { if (node && !GTK_CTREE_ROW (node)->expanded) - gtk_signal_emit (GTK_OBJECT (ctree), ctree_signals[TREE_EXPAND], node, - data); + gtk_signal_emit (GTK_OBJECT (ctree), ctree_signals[TREE_EXPAND], node); } static void @@ -3154,8 +3153,7 @@ tree_collapse (GtkCTree *ctree, gpointer data) { if (node && GTK_CTREE_ROW (node)->expanded) - gtk_signal_emit (GTK_OBJECT (ctree), ctree_signals[TREE_COLLAPSE], node, - data); + gtk_signal_emit (GTK_OBJECT (ctree), ctree_signals[TREE_COLLAPSE], node); } static void @@ -3176,11 +3174,9 @@ tree_toggle_expansion (GtkCTree *ctree, return; if (GTK_CTREE_ROW (node)->expanded) - gtk_signal_emit (GTK_OBJECT (ctree), ctree_signals[TREE_COLLAPSE], node, - data); + gtk_signal_emit (GTK_OBJECT (ctree), ctree_signals[TREE_COLLAPSE], node); else - gtk_signal_emit (GTK_OBJECT (ctree), ctree_signals[TREE_EXPAND], node, - data); + gtk_signal_emit (GTK_OBJECT (ctree), ctree_signals[TREE_EXPAND], node); } static GtkCTreeRow * @@ -3312,7 +3308,7 @@ real_select_row (GtkCList *clist, if ((node = g_list_nth (clist->row_list, row))) gtk_signal_emit (GTK_OBJECT (clist), ctree_signals[TREE_SELECT_ROW], - node, event); + node, column); } static void @@ -3328,7 +3324,7 @@ real_unselect_row (GtkCList *clist, if ((node = g_list_nth (clist->row_list, row))) gtk_signal_emit (GTK_OBJECT (clist), ctree_signals[TREE_UNSELECT_ROW], - node, event); + node, column); } static void @@ -4279,7 +4275,8 @@ gtk_ctree_select (GtkCTree *ctree, g_return_if_fail (ctree != NULL); g_return_if_fail (node != NULL); - gtk_signal_emit (GTK_OBJECT (ctree), ctree_signals[TREE_SELECT_ROW], node); + gtk_signal_emit (GTK_OBJECT (ctree), ctree_signals[TREE_SELECT_ROW], + node, -1); } void @@ -4289,7 +4286,8 @@ gtk_ctree_unselect (GtkCTree *ctree, g_return_if_fail (ctree != NULL); g_return_if_fail (node != NULL); - gtk_signal_emit (GTK_OBJECT (ctree), ctree_signals[TREE_UNSELECT_ROW], node); + gtk_signal_emit (GTK_OBJECT (ctree), ctree_signals[TREE_UNSELECT_ROW], + node, -1); } void -- 2.30.2